From: Kim F. Storm <storm@cua.dk>
Date: Mon, 9 Sep 2002 22:43:40 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~55381
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2bbfbf25607338afaa163207a14362542a8ad660;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 141d8544faf..ad9e09305b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-10  Kim F. Storm  <no-spam@cua.dk>
+
+	* macros.el (apply-macro-to-region-lines): Let-bind mark-active to
+	nil while executing macro to avoid triggering delete-selection-mode.
+
+	* simple.el (keyboard-quit): Set defining-kbd-macro to nil to
+	cancel defining keyboard macro when applicablex.
+
 2002-09-09  Markus Rost  <rost@math.ohio-state.edu>
 
 	* files.el (save-some-buffers-action-alist):  Use lower case for
diff --git a/src/ChangeLog b/src/ChangeLog
index faf995354ca..4f418b00bc4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-10  Kim F. Storm  <no-spam@cua.dk>
+
+	* macros.c (end_kbd_macro): New function.
+	(Fend_kbd_macro): Use it.
+
+	* macros.h (end_kbd_macro): Declare extern.
+
+	* keyboard.c (Fdiscard_input): If defining keyboard macro,
+	end and save it instead of discarding it.
+
 2002-09-09  Markus Rost  <rost@math.ohio-state.edu>
 
 	* s/sol2-6.h: Fix typo.  Add comment.